Merge "Doxygen format <android/log.h>." am: 969539c5c8 am: 3d9706ea36
am: 12f01fb386

Change-Id: I878270c4e9ed0526d7544ae7c5a52229bf7da953