Merge "Make tinyxml2 build with the VNDK." am: 513377fb55 am: d4164674da am: acfbe7b4ee
am: 1404178651  -s ours

Change-Id: I57ca08242ee4aff807faf3ee5359925e79733d11