Merge "Add --max-res-version flag to aapt." into gingerbread