fix for build errors

Change-Id: I7c9630079d032264e8dd6efef5d5789537157c24
Merge remote-tracking branch 'kf/p-android-omap-3.4' into p-android-omap-3.4