Merge "Update script for AndroidX" into pi-dev