Merge "Updated makefiles" am: 32d2e64983 am: dd7effa5af
am: 04fc12d2d7

Change-Id: I27a0476e23c793c6dac0481a405fd8a535d10895