Merge "Apply http://svn.apache.org/viewvc?rev=936696&view=rev." into dalvik-dev