Revert "Revert "Use aconfig flag for NAH refactoring""

This reverts commit fe27605d632e403c517d10bff73cbb443dfa0dba.

Reason for revert: resubmit

Change-Id: I88998285923a05f1252849e6732ccd5223000af3
4 files changed