Merge "Tracking merge of dalvik-dev to gingerbread" into gingerbread