Android 9.0.0 Release 47 (PQ3B.190801.002)
Merge "Adapt to new inlines in bionic." am: e5a77d9bca am: dfe6d31734
am: d59ce4d17a

Change-Id: Ic22c8b10529e61f81ffcf783adb00a11fa5ac509