Merge "Switch AOSP ARM build to use GCC 4.8."