aosp-stable: Support disable-2nd-arch when building generic