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

Change-Id: Ie9be8db9eeca3ff0470fcd85ebc808fa2f80bd33