manually patch in https://github.com/JustArchi/android_build/commit/0cf89401cc8092dda959b5746ec4899fda756cec

Change-Id: I8df53ececb28590ae753ef63deae97605307dde0