Merge "Fix makefile warning." am: f523227a6e am: 9e317f8743
am: 1cb063d3ed

Change-Id: I83e952804b47ad50b1c8c9125ef36772f6571d69