Merge "fix redirect for AIDL doc bug: 5967288" into nyc-dev am: 66ffbbfdf9 am: 6e10a6c034
am: 9261e016b7

Change-Id: Ied4d3e3d6aede6cbc215aed2634819906dc18de7