Merge "ART: Refactor libctstiagent build"
am: db8d9091bb

Change-Id: I055ac1104e44dbd194658eb665ca9ce4e17ddfd4