Merge "Rename repo_diff_android.py workspace directories"
am: c968b0f53c

Change-Id: Ie497ec83b6796a9447e068482282e56cdc6b33e1