Merge master@5428150 into git_qt-dev. am: 2ee8b9ba62
am: 83c173db43

Change-Id: Icb2b8b74cfc39b6df71f4ce06e7af127191a85dd
tree: d4d0f1ccfa3d6b82ef0a0be0a353328a3001714d
  1. library/
  2. tools/
  3. .gitignore
  4. OWNERS
  5. PREUPLOAD.cfg