Merge "Add support for LOCAL_COMPATIBILITY_SUITE"