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