Use our android_build
(rebased)

mistake