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

Change-Id: I4a8f17d666da7084790b99d79fcd289896416f45