Merge "Fix directory where CtsTestStubs.apk is found." into lmp-dev