Merge "Updated makefiles"
am: 32d2e64983

Change-Id: Ib4d6b4225f9553aacfd9381ac1710c2ba7318bf3