Merge "Phony module vndk_package is added" into oc-mr1-dev