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

Change-Id: I8129313c986eb68ed6862bab50ed284127a38358