Revert: Use AOSPA vendor files