Change-Id: Ic6aed06298dcb668a2c0f2c09d25612437893d1b
Only sdl app builds work properly for now. Change-Id: I7807d42f69b8577b401e48cdc63de71e54f49217