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

Change-Id: I97b702e0ac0327f589908058a3650e8e91f09c99