Merge "Stop relying on /usr/bin/python for SDK builds" am: f5f2b3bfaa am: a0bb9f649b

Original change: https://android-review.googlesource.com/c/platform/development/+/1788908

Change-Id: Ib52ffacf9844db37723d53af0a33555640c9ae2f