Revert "Linux 3.10.61"

This reverts commit 117812c99187584174b2c20abb4d903b4013bb3a.

Change-Id: I8f865b0405b2f72c95b48ad757e780e218609666
Merge "Revert "Linux 3.10.61"" into lollipop