Merge "Update makefiles."
am: bbf39eb0b9

Change-Id: I4f7ae72b65dabedbea7da5d80f2cb454959bd9f1