Merge "Added make files for variable Nougat MR1" am: b27fb9f528
am: d7214ec091

Change-Id: I2aeb46876fc225fdc2da0d2448104c87bc0d0ed9