Revert "AOSPA not need"

This reverts commit bebc6d3cc868a6b74b427897c3c0a3e4a109d4cb.