This reverts commit f36079a2. Reason for revert: Removed build system integration Change-Id: I7db26f2c3cc1ec20a78614a797275a07707f0e30 Test: manual