Merge "[MIPS] Fix bionic test build" am: 63ccb1bdac am: 05d6befe01 am: d6b302458f
am: ecb70b92c8

Change-Id: Ia59b75f9a6e631324ff54a218a9675f056b7cb10