Revert "use some aosp packages"

This reverts commit 40ac04be64565dae36e46079a965671e758dff91.