Merge "Expose __android_log_buf_print and __android_log_buf_write to NDK" am: 887b89fe5e
am: 4ebf2495a9

Change-Id: Id5a0bbcd461a21167d8507ca75c681df4371d158