Fix sources from https://android.googlesource.com