Revert "Merge branch 'aosp' of https://github.com/TeamApexQ/apexq-build into aosp"

This reverts commit fc9c768ad70351ac66affd58de2b360c62589161, reversing
changes made to 0892383eb6e5a115c581eccdbb585718ad89649d.