My hack, since this pain in the ass repo totally ignores the build setup!!!

Change-Id: I6cf5c3919ecf82c18f5a94a39f4a940b24b20f3f