Merge "Refactor test harness" into oc-mr1-dev
tree: dd964c6360591162dbc5eeff92681eebe62097d2
  1. nn/
  2. Android.bp