Merge "liblog: add API level guard to NDK log.h header"