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

This reverts commit 87a8d6a4fde952b5a58ae5c5d650414447e5932f, reversing
changes made to b50577a10a1f0db195fee16bf8b3476d6b9318b0.