adjust custom OMAP4 vars (keeping in sync w/ CM merge commits on review)

Change-Id: Ic317077909cc9a2afa1e7fe984b5d3133a1d1c50
Merge branch 'jb-mr1' of github.com:STS-Dev-Team/android_device_motorola_common into jb-mr1