Follow CyanogenMod/android_frameworks_opt_hardware

Change-Id: Id2e5ca9610d0859bbece44d1194a9e09d9b227d0