Merge "DO NOT MERGE ANYWHERE Accept EGL_CONTEXT_PRIORITY_LEVEL_IMG" into nyc-mr1-dev am: ff9b220285  -s ours
am: ab60271bab  -s ours

Change-Id: I7ce588a7d17ca2c4658ea4164a7a02fcbf368c52