Merge "Tracking merge of dalvik-dev to master"