Merge "fix redirect for AIDL doc bug: 5967288" into nyc-dev am: 66ffbbfdf9 am: 97d6427ab0 am: c4fb0012e1
am: be3e7cf89e

Change-Id: I9ea973e58a3111133c0fd83890c3403a0847c9d6