[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
am: 08f403ef3f  -s ours

Change-Id: I4a7f7010afd06c55eeeb7d93916bf7fe73f86865