Merge "Update makefiles." am: b35c23e70c
am: b37145e08e

Change-Id: I83e7db4cbe04fa24ac270121f973f27aca17062b