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

Change-Id: I189e946bd4de85db79ba15e53415d57730f7b5c1