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

Change-Id: I7810593b1ddfbcfd4384ef3ca49e6a74b1d08c80