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

Change-Id: I1cf1073fb438441a6d49e609514620a363c97aa5