Merge "Add missing <android/log.h> documentation." am: bfb465c733
am: 5257dc5257

Change-Id: Ie39da71ca50303dbdfb275abe70945b2ab5e2bbe