am 9bda7101: Fix the MergeRootFrameLayout rule by checking the presence of padding.

Merge commit '9bda7101b8c7007e65f0a744d93e4e446086f3ec' into eclair-mr2

* commit '9bda7101b8c7007e65f0a744d93e4e446086f3ec':
  Fix the MergeRootFrameLayout rule by checking the presence of padding.