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