am 07b4339b: Merge "Change androidfw tests to native test target"

* commit '07b4339b2a2f39c17194b21dc301c0c026a2f197':
  Change androidfw tests to native test target