Moved hardware keys from interface/general/ to interface/
Patchset #2: Fixed derp
Patchset #3: Removed some TRD lines that jumped in
Patchset #4: Removed unneded imports

Change-Id: I115cbf01411693226b53d8e4ff0204057b4fd9d4
Merge "Moved hardware keys from interface/general/ to interface/ Patchset #2: Fixed derp Patchset #3: Removed some TRD lines that jumped in Patchset #4: Removed unneded imports" into jb4.2