Update and re-run androidconfigure. am: 31e6b20598
am: 677332e2bc

Change-Id: I494e5cbf44db51631d19a614b011897c8efac942