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

Change-Id: Ib9ade1ab3faab3358f406d73c0f99d72c63a4fbc