initial changes for building AOSPA