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

Change-Id: I13a891f0d36eb885dada3e0b52839a4f26255cd7