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

Change-Id: Ic879384fb73a72b280e2be883220253c6262eb0b