Merge "Respect manually set HARDWARE_ACCELERATED flag." into nyc-dev am: 37696cccd8 am: 674bedee2e
am: 06746184c9

* commit '06746184c9695a1ace1f403379b2d2b27a4bcbcf':

Change-Id: I926a405cc381bf6db4e705e92e568c41314f1aa7