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

Change-Id: I7151fdbc468e2a84e7fac52e1fca6236d5f45ddb