am e53fd84a: am 9e608c12: Merge "Fix issue #6381224: Initial emulator boot...
am e53fd84a: am 9e608c12: Merge "Fix issue #6381224: Initial emulator boot fails and shows a blank black screen." into jb-dev
* commit 'e53fd84a':
Fix issue #6381224: Initial emulator boot fails and shows a blank black screen.