Merge remote-tracking branch 'google/tools_r22.2' into linaro_android_4.3