Remove the unused layout config options
Don't use the device lock/unlock wrappers needlessly
Add the ability to use custom output channel coefficients

I'm not sure exactly how I want to do this yet, but this is a good starting
point.
Add a toolchain for Android cross-compiling
Merge remote-tracking branch 'upstream/master' into travis-linux-x86