Merge "Merge 6ab7e1f9 ("setlocalversion: use only the correct release tag for git-describe") into android-mainline" into android-mainline