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

Change-Id: I769d1c1058cc629d5fcb8008669f6cf11caafd33