Revert "no matter how yummy these changes looked, they break important things such as userdata size sinc the android build system doesn't override things here, so we're reverting back to this ugly BoardConfing"

This reverts commit c6c6ae1f444b3841bc47a864890f391dc9c0f16f.