Merge "Added make files for variable Nougat MR1"