Merge "Add a phony target to dist ndk_sysroot.tar.bz2" am: 516cf13c am: 9ef943e2 am: 3be7269d

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



Change-Id: Icf3b5c25d12011034324b0b136775809cadd236a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>