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

Change-Id: Ie91c49d41f0c5fef015180da208f1a626952d606