tree 7b75c46004b807f9a00d6bd39a35f03add671a49
parent 3cb0a1255c395895fe34ce01c279b88103200ccb
author Brian Carlstrom <bdc@google.com> 1282116003 -0700
committer Brian Carlstrom <bdc@google.com> 1282116631 -0700

Cherry picking changes from dalvik-dev

git cherry-pick --no-commit 5648c97be2c515bdafeff3d8a4b07ea0ddc3e357
git cherry-pick --no-commit ffdb1757
git cherry-pick --no-commit 9340bb2a4b5f828b418c0e77492dde148623c938
git cherry-pick --no-commit af5c56d1

Change-Id: Ie910601ca27e1fcff90bbf0db5bd522bab8924f7