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

Change-Id: I8c347457347dde274aadca8f7c6547ecaaf67929