Merge "Update makefiles for vndk enabled." into oc-mr1-dev