Merge "Adapt to new inlines in bionic." am: e5a77d9bca
am: dfe6d31734

Change-Id: Ic841ba2bcfb9bda08936f937faf056bb4116fa43