This reverts commit 3a62a9cc. Reason for revert: causing extra soong regenerations Change-Id: I4ceb5334634613a00ac9c312b75c623a8aced8ab