Merge "Remove __ANDROID_USE_LIBLOG_* guards" am: e780431345 am: d9dac07d5f
am: b1ebf8b079

Change-Id: Id99bce8d9de0a502d5a9a37265131935df2a2e2c