Merge "Add an undocumented --incremental option to dx." into dalvik-dev