Merge master@5428150 into git_qt-dev-plus-aosp.
am: db8640b3a5

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