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

Change-Id: I457a588f532297d706ee2bdc0d18e06e250d6ae3