Revert "Revert "Fix AOSCP build""

This reverts commit e5d132f47c03dc35924cdb68186da189c304ad25.