Merge "Fix for non-empty a[name] tags in openJdk based javadocs." am: a8c8dadd09
am: 8dd4374689  -s ours

Change-Id: I57a1638e7d632f6dd50b2d47c078d9371ff2968c