Merge "Prevent Kati from seeing MAKEFLAGS" am: 6b363e24bd
am: 01784e0aef

Change-Id: I751acea9a09e67cb65954502cc562408d948a133