Merge "Remove Android.mk from bump.py" into main