Revert: Add variant detection

(cherry picked from commit 25bac2231ca23bbe9348e2386e0c54be06380889)

(cherry picked from commit e33bbc0bd875d4d70e178b1949777458635f973e)

Change-Id: Iec0a882be32e47934de71ea370045b54261ee912 (reverted from commit f9326b18ba7d31026a1f7117734ceabe833a9c36)
Revert : defconfig: Add missing TMO flags

(cherry picked from commit 8b8c6905f1ac069195bb10c0daa08dc2f1ffefc2)

(cherry picked from commit d04edfa81986a14d2314aecd68e599dbd6b26f2b)

Change-Id: I0cb586f54336310615ea9ee36e9f16c3cab75229 (reverted from commit 1948ba31ef3dd3b7c4501927f760a445bd934813)