Update currysrc to support stable core/platform API. am: 7074dfcc06 am: 6a4ae9b82c am: cd7215e355 am: a71da3da07

Original change: https://android-review.googlesource.com/c/platform/tools/currysrc/+/1331085

Change-Id: Ie3ccf1bf0ec7cc0b3a428bd7c33ba26a3dd4848e