Merge "manifests:(All) Fix the location of aib" into linaro_android_4.2