Merge changes I47bc15a2,I7880c33b into cm-11.0

* changes:
  d2: commonize everything
  Revert "d2: add support for variant defconfigs"
apexqtmo: set default governor to interactive

Userspace sets this in a script anyway

Change-Id: I28704d7283d2bd1ec74b5d094244b1a6a59d82e8