am 7ccb7a6a: Increase the number of entries set aside for zygote initiating loader lists.

Merge commit '7ccb7a6a563396e4b64069dd4e57977d1b5b6180'

* commit '7ccb7a6a563396e4b64069dd4e57977d1b5b6180':
  Increase the number of entries set aside for zygote initiating loader lists.
  Fix handling of "--dev" argument in dalvik tests.