Merge "Update SDK tree after androidx.renderscript file name change." into pi-dev