flo: Resync with AOSP