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

Change-Id: I05282a22526f1f871dccfe9e1689aaa77603cd96