Merge branch 'linaro-android-3.1-fport' of git://git.linaro.org/people/jstultz/android into lt-3.1-android