Revert "Merge remote-tracking branch 'aospa-legacy/kitkat' into kitkat-legacy"

This reverts commit 2c678b5ed08acf8d393370630ad256c76ce949b8, reversing
changes made to 97de8d2ff229015f2ba29f783ad23a3df62ef80e.