Merge "Adapt ICU 59 API update to Doclava changes." am: e048261656
am: 0fc0cc9dd8

Change-Id: I93b14c129711fad75fee3aa34f3a0fed04eb1182