Merge commit 'b4f41119044e5ec7f7b76ed4ac02b5cfbaeb474d' * commit 'b4f41119044e5ec7f7b76ed4ac02b5cfbaeb474d': Only output proguard keep for nonempty attribute name in the AndroidManifest.xml.
Merge commit 'b4f41119044e5ec7f7b76ed4ac02b5cfbaeb474d' * commit 'b4f41119044e5ec7f7b76ed4ac02b5cfbaeb474d': Only output proguard keep for nonempty attribute name in the AndroidManifest.xml.