Merge "Ran update-makefiles.sh." am: 891f6a946a am: 566c20bd49 am: 6daf36e01d
am: a7841ef05f

Change-Id: I4b43a4680c2b72502c4f31eb582cdf2ecd6b9739