Merge "Allow java_test.go tests to use any Android.bp file"
am: 45656aacab

Change-Id: I087cf543b7bc534e39b40f9e06e13a15487af109