am 40a17a9c: am c363d4e7: Merge "remove references to TARGET_HARDWARE_3D" into eclair-mr2

Merge commit '40a17a9cba51656945212d1b21a225a7ca3e87e2'

* commit '40a17a9cba51656945212d1b21a225a7ca3e87e2':
  remove references to TARGET_HARDWARE_3D