Merge "Flatten dependency hierarchy of legacy-android-test"