Merge "ART: Refactor libctstiagent build" am: db8d9091bb
am: 2c431a0090

Change-Id: I2234d38e3996f9182e190e80943215578dfb8630