Merge "Update README.android to include how to sync to upstream"