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

Change-Id: I90ff316824f381088d084712d35d505b76357db5