Merge changes I8da1aa92,Ia112e46d into rvc-dev am: 73ef4105a2 am: d2be5141d1

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/ml/+/11680640

Change-Id: I43b1f4cf94266f1fcc6b6359d0f9996cbf7622c9
tree: 56364f91eddbfe199330ed8031c779e0d4e4b181
  1. nn/
  2. .clang-format
  3. CleanSpec.mk
  4. CPPLINT.cfg
  5. OWNERS
  6. PREUPLOAD.cfg