Merge "Add option to override minor version" am: 48662b25fc am: 8e6eae32d6 am: 43af41b52b

Original change: https://android-review.googlesource.com/c/platform/build/+/1822181

Change-Id: I33b4b53dc66b788a5ece17bedfcc3c547c57799b