Merge "Respect manually set HARDWARE_ACCELERATED flag." into nyc-dev am: 37696cccd8 am: ff54c9eeb2
am: e42b3f0586

* commit 'e42b3f0586b5055eeb1e77c4b5d52001fcff9c90':
  Respect manually set HARDWARE_ACCELERATED flag.

Change-Id: I84acd6bb147dded75314aa97e21dc8d9446fd43a