[automerger skipped] Merge "Revert "Revert "Copy files related to sdk dev tool(activity_actions.txt, and etc.) from""" am: b8d122e2b5  -s ours am: 05b49c5303  -s ours
am: 1cee84a73a  -s ours

Change-Id: I1ae2c086803a6b256936c145685ab30f7f2e8a30