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

Change-Id: I7e135a9319b70419673e56f9a65e037b049f1550