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

Change-Id: Ib6122b154dafcb12ff6e9dd9d9e8775a5ddbcbd0