Merge "Support source code cross-referencing for C++ and Java" am: 247de68b am: 61272795 am: 94704e95 am: 6e405f37 Change-Id: Ieca4bd91a90b76675b647d2894019d87c2ec16c3