[automerger skipped] Merge "GraphicsEnv: refactor to unify the debuggable logic" into qt-qpr1-dev am: e10e0fffcf am: dc9e5ee91f -s ours
am skip reason: Change-Id Ica49254df2c7c090808411935cdeb8efd4e3cb51 with SHA-1 097a3062b9 is in history

Change-Id: Ie63ac5c5b57a962f2950b9472195277487b0d8c9