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

Change-Id: I364201f1f4393630a3357ad815d14423ec6db4f9