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

Change-Id: I4fe0c00ea75876e2bdb4056caeb80800a0a89db1