HydraTweak:

A squashed/merged commit of
  https://github.com/IAmTheOneTheyCallNeo/android_build/commit/2c1e134c8a97cbc02adf7888327a7a276a7c4846
  https://github.com/JustArchi/android_build/commit/8e1b82c082a8de9160e6c0fc3ded37b591c3e517