Merge "Ignore comment lines in proguard mapping." am: 428d80e3a4
am: 59ce4c81d4

Change-Id: Ib0cadb25c0980ac3a459e497f63b020d1356b7cc