Merge changes I6555c135,If5723ff4

* changes:
  logcat: test: also check "failed to clear" in blocking_clear
  logd: reader/writer element locks