Merge "Stop statically including legacy-android-test"