This reverts commit 67df9f0870. Reason for revert: broke native coverage b/333108088 Change-Id: Ice6cedcdeb35644eb0ee9edbac659feed21496ad
67df9f0870