Merge "servicemanager: preload vintf manifest" am: bd1bb497b7 am: d965b134f1
am: 061df1d989

Change-Id: I3fcbe29044048054eca46259860a9cb6ddbc0248