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

Change-Id: Ic4492b1049cb2aa4f64edf4decb4a53a6d1ac685