Merge changes I420b5b8a,Ica23fe41

* changes:
  log.h: wrap android_testLog around __android_log_is_loggable
  log.h: deprecate CONDITION