Merge "Clean up some compact dex comments"
am: 554a7e5f40

Change-Id: I687487f1dd5e22229afaa47dc120ee633b722a6e