Revert "Use aconfig flag for NAH refactoring"

This reverts commit 6212b77ac83ee4553768caabaa4aa80563064f6b.

Reason for revert: b/306410754
Bug: 306410754

Change-Id: I58a56d16e9cdca589249738dd8fe1d5301c3e97f
4 files changed