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

Change-Id: I8078c4dfbb3cbc55dd6d08888c67c31721a77397