Merge "Update makefiles."
am: c202d17fa6

Change-Id: I91e945ede9f4e46867aac20303063b309576ed9d