Add bionic optimizations

Change-Id: I6e1d7bbcbb5deab9381c0f63aef8baa576768d95