Merge remote-tracking branch 'lsk/v3.10/topic/aosp' into linux-linaro-lsk-android