Merge "Update makefiles." am: 9119d4ccd1 am: 242b2288d7
am: c6da54569f

Change-Id: Ib7f7a9cdb64985d545443edac5bb8e9c169fc592