Merge "Update makefiles." am: c202d17fa6
am: 70d20a497e

Change-Id: I717a93e5b3933dd1b2f8a5e9af61cb6ac8a41423