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

Change-Id: I971e4447ec3e81d7185df8d182e7a7a32ceca289