Merge "Update makefiles." am: bbf39eb0b9
am: 3334081377

Change-Id: Ib76fd65166dd7358b11225a3bf7e1c1b0338fe08