Merge "Allow to override --version-code and --version-name in LOCAL_AAPT_FLAGS" into froyo