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

Change-Id: Ifbc7beb548565605e410a14bbaf7bc6121b1b3bb