changes in arch with aosp code