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

Change-Id: I8bc18aa66c7b621ed90d82412b6c29e72334f3f1