lsk 14.05 android release
Merge branch 'linux-linaro-lsk' into linux-linaro-lsk-android