Merge "Apply vndk_package to generic system image"