Merge changes Ifef817a0,Ia013f48a into stage-aosp-master

* changes:
  Fix doxygen syntax.
  Restore __ANDROID_API__ guards for core <android/*> APIs