Merge "Minor code cleanup." into oc-mr1-dev
tree: 31046381649687e37b36090b44a33157cc229795
  1. nn/
  2. Android.bp