Android 4.0.3 CTS verifier release 1
Merge "Revert "Put canvas on a layer"" into ics-mr1