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

Change-Id: I0412d3f817d8edd9fc28e921985c08e8740bb507