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

Change-Id: I2fb1393c8151262f8d9b4c58ccc45214f44813f3