Android 4.1.1 release 6
Merge remote branch 'goog/dalvik-dev' into dalvik-dev-to-master