Android o preview 2
Merge changes from topic 'upgrade-expat-2.2.0'
am: d61777ec98

Change-Id: Ie17e4d110719ccd42446339fd21aaee3ee233a6a