Merge "Ignore comment lines in proguard mapping."