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

Change-Id: Ie98f31f5811f66a8dc58f2f9d62fdad87bb61065