Android 4.0.4 release 1.2
Merge remote branch 'goog/dalvik-dev' into dalvik-dev-to-master