Merge branch 'linaro-fixes/android-3.10' into linaro-android.3.10-lsk

Merge "official" android-3.10 branch in w/ older experimental/android-3.10
to update lsk targetted branch to the official branch w/o any rebase trouble.

Signed-off-by: John Stultz <john.stultz@linaro.org>