Tracking merge of dalvik-dev to master

Change-Id: Id4c19401ad0aa238219aaf5d9a20d2889d0a4b18
8 files changed