Merge "Android.bp: Move from src&test to top level"
am: b3a150864e

* commit 'b3a150864e66c8bfcb4ad5a6ebf0876c02b2b8fa':
  Android.bp: Move from src&test to top level