Add LOGS_DIR option and fix getopt string for 'e'.

Change-Id: I179604848750a45c564121e0cb9722a07a9ed9a9
Merge "Add LOGS_DIR option and fix getopt string for 'e'." into stable/4.1