Merge "Fix makefile warning."
am: f523227a6e

Change-Id: I852b00eb0c562003307507d02e1dd80a7d42cf9f