Merge "Merge "Fix makefile warning." am: f523227a6e am: 9e317f8743 am: 1cb063d3ed am: bb354909bd  -s ours"