- BUG:1337295- NULL terminate getopt_long option list

Change-Id: I50463864ef515d5706b0b27206d2583b83bbfca9
Merge "- BUG:1337295- NULL terminate getopt_long option list"