Moving from Linaro to AOSP