Fix mixed-build CTS failures. am: 6445511313

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

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