Merge "Update Makefiles Missed In Previous Commits" into pi-dev
am: 74978ebac9

Change-Id: I993e9f090f09a8d5315152d8ff0c8f5f14357174