am c5066d81: am bc7cb7d9: resolved conflicts for merge of 5e69741e to klp-modular-dev

* commit 'c5066d81a85d1c98f3d885d50a65299818a0a60d':
  DO NOT MERGE Increase the system-image revision number after opengl bug fix