Defining BINDIR before you use it is helpful

Change-Id: I59c62f4bd9e3ee2f9ff5552aa063523ce060400d
Merge "Defining BINDIR before you use it is helpful" into production