Merge master@5406228 into git_qt-dev-plus-aosp.

Change-Id: Ied6a18325b3117a58a5635ceb0691e4df057241a
BUG: 129345239
tree: c351ec9ccb5454ea22c3f9c437c7f69cd999fa54
  1. nn/
  2. .clang-format
  3. CleanSpec.mk
  4. OWNERS
  5. PREUPLOAD.cfg