Merge "sourcedr: Remove old command and add setup.py data" am: f84fbc458f
am: 1b63be5acf

Change-Id: I78d1ccdbfa9f84e33a29391d8712921929a3f99f