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

Change-Id: Ib084b0e35cbf38d1049513441ca07dbd2029ba1a