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

Change-Id: Ia26c81ec2713c43239946508a56b33077612e1c4