Merge "Split VendorFrameworkCompatibility test" am: e88fd7c9ed
am: 80886741c0

Change-Id: Iefc3eb0d66e3738a3257806fe652140644b87f0f