Merge "Split up ti-agent/common_helper.cc" am: a073f1f50a
am: e5e0f531bf

Change-Id: I3305f4713e450f6fda53d2af36e628d248621db2