Fix ARM toolchain building

Signed-off-by: Paul Beeler <sparksco@gmail.com>
Merge remote-tracking branch 'aospal/kitkat' into kitkat