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

Change-Id: I26f4ba98269e75b2140d216435417c38e6585f68