Merge "remove references to TARGET_HARDWARE_3D" into eclair-mr2