am 8f461e5c: resolved conflicts for merge of 1a15cb7e to gingerbread-plus-aosp

* commit '8f461e5cc2972ed5054469b92bc841c07a50b7cf':
  [PATCH] Init - make sure the last parameter to execve is NULL