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

Change-Id: I027bb7229d5d65953e7dc34dda19e7703bfd07cb