Merge "liblog: remove alarm in logd_reader.cpp" am: e3fc9ac7e3 am: a66512dd6f am: c8a123619f
am: a270bf675e

Change-Id: I02ff423d1db5a1ef15d35dd777aafd52acfbd288