Add missing AOSP deps