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

Change-Id: I61aa106d6c7275d281721e091ce96ca055ad43c2