am 8a5198a1: am fd867303: Merge changes I420b5b8a,Ica23fe41

* commit '8a5198a1505a4dc7d4722bb58a6eb809b0dd5d2c':
  log.h: wrap android_testLog around __android_log_is_loggable
  log.h: deprecate CONDITION