Fix dependencies
Support patches for AOSPA