Merge "liblog: android_log_isloggable failing apct" into nyc-dev