Merge "Use StrictJarManifest.ATTRIBUTE_NAME_NAME instead of Attributes.Name.NAME." am: 2dc5a42743 am: 597eb7f87e
am: d05cdbcccd

Change-Id: I04ccac84d682b1bfd789f0e9f28cdd1113e52c76