am 511572b4: am 9e2463e7: add/remove displays properly on hotplug events

* commit '511572b465d981bbfe74969f879ee0ce042fa4bb':
  add/remove displays properly on hotplug events
am 4214402a: am 33baee5d: Merge "Add android.hardware.camera.any feature to camera permissions." into jb-mr1-dev

* commit '4214402aa22cfa9aa672045abab6b0a62a636722':
  Add android.hardware.camera.any feature to camera permissions.
Reconcile with jb-mr1-release - do not merge

Change-Id: Id330f9144f47c1a9e314ac85b7b867cbfc7c27e8
am 1dde9c32: (-s ours) Reconcile with jb-mr1-release - do not merge

* commit '1dde9c32f2ee61fc4043bebaae14a906ed4d26f7':
ConsumerBase: make fence names meaningful

Change-Id: I3580120cb63c027c327e80ec70e68650b75395de
Merge "ConsumerBase: make fence names meaningful" into jb-mr1-dev
am ff5c4aa6: Merge "ConsumerBase: make fence names meaningful" into jb-mr1-dev

* commit 'ff5c4aa676d157f4911ef06e328e687725e8b9f9':
  ConsumerBase: make fence names meaningful
am 2cee285a: am ff5c4aa6: Merge "ConsumerBase: make fence names meaningful" into jb-mr1-dev

* commit '2cee285a97900cccd0992a274228ca806ba70884':
  ConsumerBase: make fence names meaningful
EGL: expose the EXT_create_context_robustness ext

Change-Id: I1db43e96aa5e9e91a6176a4a3e5aa9d1f3ee4a7e
EGL: add the EGL_ANDROID_framebuffer_target enum

Change-Id: Id8b1b114e2a7a88956b857c63a0429e9b33fdb5c
Merge "Return back-end result from eglDestroyImageKHR"
am 77af25b6: Merge "Return back-end result from eglDestroyImageKHR"

* commit '77af25b6dd41e76052b5b0ec6aaeebca896a4dbe':
  Return back-end result from eglDestroyImageKHR
am 98838aa0: am 77af25b6: Merge "Return back-end result from eglDestroyImageKHR"

* commit '98838aa0836518b7397cbfe763f34305e3387a5f':
  Return back-end result from eglDestroyImageKHR
am 81b316aa: am 98838aa0: am 77af25b6: Merge "Return back-end result from eglDestroyImageKHR"

* commit '81b316aa5395b6318ad4a10e1ed27d0b9b0df07f':
  Return back-end result from eglDestroyImageKHR
log an error when eglCreateContext() fails in an inconsistant way

this will help debugging bug: 7216919

Change-Id: I54ac65f20c5ed55cc93a5cbc5350fadfb0fcb804
handle EGL errors

for now we just restart the runtime.

bug: 7225248
Change-Id: I7638ffe82075a4db9e7e6f9e35cf48afcb5a387a
am 500407a2: log an error when eglCreateContext() fails in an inconsistant way

* commit '500407a2c07ced40c36e7356574a47bcec9c2fd9':
  log an error when eglCreateContext() fails in an inconsistant way
am 0d45d711: am 500407a2: log an error when eglCreateContext() fails in an inconsistant way

* commit '0d45d711976bdca1165536b8948680680d38eb6a':
  log an error when eglCreateContext() fails in an inconsistant way
don't call eglMakeCurrent() before calling HWC commit() on HWC 1.1

this call is not needed and misleading on HWC 1.1; it can also have
a negative performance impact when multiple displays are used.

Bug: 7124069
Change-Id: I47cd25c9d6e69abcc9333b9ecd5044e8fb1919ec
Merge "EGL: expose the EXT_create_context_robustness ext" into jb-mr1-dev