Merge "Fix typo in update makefiles." am: b1770f1085
am: 0849f66210

Change-Id: I3da7e952b3d44bccdee21e05d647ffb84935abc5