Merge "Update makefiles." am: a597fa9a8d
am: 7794db5bd2

Change-Id: I0ed7bafb409ac11fd62728ac99e4261c7211ceb4