GitLab

This patch provides some changes that allow the NDK build scripts
to suport building the files corresponding to multiple toolchains
for a given architecture.

While this is not enabled for now, this is to allow building
both 4.4.3 and 4.6 in the near future.

Change-Id: I4f9c886073bc816f9353fa2fceea819179c92f04