Switch back arm-linux-androideabi-4.9 to jb branch

Change-Id: Ibc56b3ada9eafeb2f7c67290d2ad1bba702f99b7