HACK: Modify .mk files to avoid strict compiler errors

Change-Id: I95dd11f96d8aaad31078b599eca1745be912b488
6 files changed