Update to Google 5.0.1_r1

Change-Id: I117937e2d34ddd3a2202a902d0583f1606f664ee (reverted from commit d84c5d4f4627f7762982ec8fc1c156bbf65558cd)