Android R Preview 4 (RPP4.200409.015)
Merge "tinyxml: reduce visibility." am: e1e5c1304d am: 3eb636e00b
am: 87c970db58

Change-Id: I3e6be470f3c14860d286f7fa2d8d1845c08f1724