Revert "AOSPA not need"

This reverts commit 2013ac2d4a07d9b4e0aed4510cece1345a972832.