Merge "Remove warning from VNDK's <cutils/log.h>"
am: ab96d9dec1

Change-Id: If063f39c028064ec984c23eddb0e41a9336d269f