Unify AOSP and CM11s versions