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

Change-Id: I5a85181937ce0b2e476b55bdb0ea44970edb9489