Merge "Add --target-api=N option to dx." into dalvik-dev