Revert "cancro: updates from aosp l(2/2)"

This reverts commit 78e9c1094437cc26c654b871f38cf48bac590129.
Revert "cancro: update blobs from aosp build(1/2)"

This reverts commit 01e319e7bc6de2a8cda987d6f8d27bd58a6bf18d.