Revert "Switch to boosted arm-linux-androideabi-4.9"

This reverts commit 01b15ee130dd512925ac8007836490a67130e813.

Change-Id: I61008855f5988875ddc5a9bee5583c64ac353e7e