Merge "liblog#__android_log_btwrite__android_logger_list_read fail" am: 692c9973e1
am: 3b3bf74b53

Change-Id: I7bb7e2b1633460f044c8d4960b28de450c56b872