Merge "remove a read lock to work around a platform deadlock problem." into klp-dev
tree: 1aa9875668de7afd9ca50fe7c757a39433d2edd3
  1. android/