Merge "Refreshing incfs from the recent AS build." am: 2be53de8df

Original change: https://android-review.googlesource.com/c/platform/prebuilts/misc/+/1688583

Change-Id: I56a3c30136989f8402d8adca630b4b4093db4802