Revert "Fix build"

This reverts commit 0ca1252dd1638316e7b149fb9ff0d142d2b0df75.
Revert "Updated OMX (removed HFR, etc.)"

This reverts commit e874293842f98fedec7759e93cc697178ea2c825.
Merge branch 'cm-11.0' of https://github.com/XperiaSTE/android_frameworks_av into cm-11.0