Revert "JustArchi's ArchiDroid Optimizations V3"

This reverts commit dfe3fb97921cd77f5d416bb002803f38501ef9de.
I've fucked up the cherry-pick again, so manually merged JustArchis commit 0cf89401cc8092dda959b5746ec4899fda756cec

See <https://github.com/JustArchi/android_build/commit/0cf89401cc8092dda959b5746ec4899fda756cec> for more details on this commit.