Android O MR1 Preview 2 (OPP6.171019.012)
Merge "Removed libstdc++ from tinyxml so it will compile with libc++ that is in VNDK" am: ccc219c40a am: 14d2e1f729
am: 07e3140444

Change-Id: I0e4da77a4f570558acc5f9d0638676bdb1d6366a