I don't see the flag set for n4.

Let me cherrypick the changes that have ended up in the final set (Want to avoid all the reverts).

And BOARD_USES_QCOM_HARDWARE can go up on gerrit where the maintainer can chime in