Merge "Update makefiles." am: bbf39eb0b9 am: 3334081377 am: 5306d88cad
am: 8cc75b051e

Change-Id: I249729c9b76c8433eaea0daa0090f8de09c9f46d