Merge changes I09afb2dc,Ia37263f0 into msm-3.0

* changes:
  msm: Select ENABLE_HOLES_IN_ZONE
  arm: Add HOLES_IN_ZONE option