Android 4.0 CTS release 1
Reconcile with ics-factoryrom-2-release

Change-Id: Ie2cc2f5f8339562f612278346ebd1d0aae763607