Add Removed AOSP stuff
Adding TARGET_CPU_VARIANT to config file.

Merge from internal master.

Change-Id: I67d505f3101ac9397664e879185ecebf13baa3ae