Merge "Mark libGLESv2.so and libEGL.so as VNDK libs." into oc-mr1-dev