Change device/common back to aosp