Merge "Fix malformed CtsTestStubs manifest entries."