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

Change-Id: I7d9acd82cf44ea492b1f7eae27e30d40b115a828