Merge "Add ro.vndk.lite to property_contexts"