Tracking merge of dalvik-dev to gingerbread

git cherry-pick --no-commit 633d446a

Change-Id: I0f96f14dfffd9fa8e3bd2480c3de0518818616e7
1 file changed