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

Change-Id: Iec6063aa61330c1e77d82279a8634cf2bf62c6e3