Merge "Rerun script/update_makefiles.py to fix build"
am: cb19291b3b

Change-Id: I41fa8c8c3151f0186f69ade004df50d21c14b4b5