Merge "ART: Refactor libctstiagent build"