Revert "DO NOT MERGE Enhance local log."
Revert "DO NOT MERGE Enhance local log."

This reverts commit dd6f8441292d30cc51c1e32bb27fab8dfb791f90.

bug:22632129
Change-Id: Ibd4b9c35b66cb7d877085bc010fde45a682ba34f

xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base