android-msm-2.6.29: build warning suppression and merge fixes