Merge "Expose __android_log_buf_print and __android_log_buf_write to NDK"