Merge "Build vendor shell unconditionally." am: bba8f4a328 am: 8547d5a6a9 am: 83c29a0b24
am: 0a685140c5

Change-Id: I0960b248ffc238f017a7fce637866b0f08805dfb