This reverts commit 0f93e5b9. Reason for revert: causing extra soong regenerations Change-Id: I4ed2e5c82dfe3e99fbb9590b80f92c79a27e8025