Revert "Pull in Strict Aliasing fixed repo's"

This reverts commit fc2844678ab4f1fe9bb03dc2fb682f2e292017c4.
Still use android_build