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

Change-Id: Ib72ec2497e7b58c42ecca05cc318d7345e9fce69