This reverts commit 708b854c4a
.
The only diffs induced by using module_* are those incurred from using
armv8 for the 64-bit variants.
Bug: 185789027
Test: diff tests in mainline-prod and sc-mainline-prod
Change-Id: I7ed5cf93d240a58b50b655b861dd60c6965aafff