derp

Change-Id: I74662bb74e204ab056b282b827a58a63000fda8e
Merge https://github.com/A2D-MY/android_frameworks_base into cm-12.0