Merge "Keep AOT type to support AAC offload feature"