Merge "Add missing vts entries in LOCAL_COMPATIBILITY_SUITE mkfile args" into oc-dev am: 6ef71be67b am: 3856d55341 am: 0ac46084ab
am: 9195b5e7cf

Change-Id: I9b01cc7c555a1d3d63e272b28f362084c02f32f4