Merge "Add support for multiple LOCAL_COMPATIBILITY_SUITES & undefined testcase directories." am: 6abedc9b3e
am: 22cc401165

Change-Id: Ie62e372c19e2b187079c9830ba4936aaa14bec29