Merge "ART: Compile libctstiagent with the NDK" am: fee188b96a am: 201f4aefbc
am: 861d3b1283

Change-Id: Iec7fefed60677c52674395218fc16ce90b928e44