Merge "Special case init for android_is_in_vendor_process."
am: 3dd9881ca7

Change-Id: I49c4d42398f13737e8ddc6c0c04ad685e561b463