This reverts commit 5587cb0f. Reason for revert: Breaks the build of multiple devices Change-Id: If9fbcd0424c5ec08ce381202f4afff11825a612e