Merge changes I6145bae8,Ia9452b3e

* changes:
  logcat: unit test produces log stutter
  liblog: test failures due to permission issues