Update makefiles. am: a6c5ff2c6d
am: 19fda75273

Change-Id: I2cbd273d4f9420d075351d97bae4a635037749a5