Merge "Remove D8 make variables." am: 3c8949e342 am: 70e5a23d9e
am: 8aa4a5d0b9

Change-Id: I87a542ca0673a769bf0800ea268d4ba01172fcfe