Merge "Dex merger handles empty sections" am: eebf335a7f am: e4ecc9ff1d
am: 285d07a7f3

Change-Id: Id057f12df191e028c3f28fef5f588f4b047b2458