Fix build after Android patches