Merge "Always return /vendor/bin/sh as shell for OEM ids in getpwnam() etc." am: ddf92a1b am: ece67878 am: 85f1526d Change-Id: Ieea0cd696a9093ccf3a9dea86db5390a14d8fcbe