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

Change-Id: I249f6ab4b2cc94c9598a71249c1a746060ac283c