Merge "Fix bugs in incremental dx." into dalvik-dev