Merge "manifests: staging-vexpress-tc2-isw update to 4.2.1" into linaro_android_4.2.1