Merge "Remove __ANDROID_USE_LIBLOG_* guards"
am: e780431345

Change-Id: Idcf2c1fc8a861bbae7b1b738900f4a13055f3efd