Merge "docs: move new AIDL doc back into the existing doc, but move the side nav location out of tools" into honeycomb