JustArchi optimizations
Original commit https://github.com/TeamCanjica/android_build/commit/dbe7e5b4fff354cd9a9ef2e6605fa7db7eef9727