Merge "Add OpenGL ES AEP feature xml." into lmp-dev