Merge "Apply vndk_package to generic system image" into oc-mr1-dev am: e6262be0d6
am: 414d7c6ee2

Change-Id: I6af1e992f8d55b5e921840333a4b335352b47757