user code also needs these defines; there was a hard-coded definition left out from debugging that didn't get cleaned up Change-Id: I951fcd6a3d6bc1d1f1c3e897058908167520f7bc
Change-Id: I73db5f904a7d86052aae62e67b01281763c83561
Remove old build system at the same time Change-Id: Ifdffe1fcd4cfece05f036d8de6e7cb74aca65f62