Merge "Address CVE-2011-1090." into dalvik-dev