merge from open-source master

Change-Id: I698b3c16bdef8751cc857b00f815cb2f95465431
tree: 6ea4dbc15527a07bfe7658898311725f761b3ee6
  1. liblog/
  2. logcat/
  3. logwrapper/