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

Change-Id: If879864c89acdadd7f756e91b2c5f96e96e47b03