Merge changes Ifef817a0,Ia013f48a,I23db5a21

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