am 95a68d3b: am 69bdba21: Merge "liblog: use private/android_logger.h"

* commit '95a68d3b5beb9ca0eb50276578a47f3f0882e199':
  liblog: use private/android_logger.h