Merge "servicemanager: avoid segfault on null manifest." am: e4d836a41f am: 6a52945988
am: 0ffc43e86a

Change-Id: Ic980783663e47228e1a82eaf390efa2e13e00306