Merge "Have AEP GL feature depend on GLES 3.1 in badging" into lmp-dev