Merge "Apply vndk_package to generic system image" into oc-mr1-dev