Merge "Add a rule for android-common-ex tests in testrunner"