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

Change-Id: Ia7aa76220e2592db39a8d8ad281c5e04438bab58