Merge "Replace libGLESv3 symlink with shared library" am: 18ff655766 am: bc432368f4
am: 7c1cd3422a

* commit '7c1cd3422a272ce6de4a0ae71f64466601d6c172':
  Replace libGLESv3 symlink with shared library