fix paths when 2nd arch gcc is a different version
fix paths when 2nd arch gcc is a different version

arm64 is using gcc 4.9, arm is using gcc 4.8.  Fix setpaths() to
get a separate version for the 2nd arch.

Change-Id: I7bde01308fc7718360e7d0fbd46b3ae8c5f55fa7

xorware/android_build,xorware/android_build,xorware/android_build,xorware/android_build,xorware/android_build