dev/android-linux-version-conflation

Base of #764 to hoist `Android` blocks above `linux` blocks. Also removes arch-specific blocks where possible.