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

* commit '674bedee2ec388201b0482946bd5535c419c8f21':

Change-Id: I69081e1537c0c2624d4ad590095ce05572b0faef