Merge "When using inherit-package for a test, also allow specifying a new test...
Merge "When using inherit-package for a test, also allow specifying a new test suite." am: c51c523b am: ac00ab68
am: f1847c0a
Change-Id: Ibac629980c5794b00f0c2e31b9c4c27aef132e55