Merge with Linaro LSK-Android-14.05