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

Change-Id: Ic2513da129f9fe2deadfe887d99e7368e8cb46e4