Upload from CyanogenMod

Uploaded from here: https://github.com/CyanogenMod/android_build/commit/d192ab851fc36b0a69ce34db0f8e4c88f8856a25

Change-Id: I458eecb11c04a1e4d1e65d5f68bcddb4566a906a