Merge "Label /vendor/bin/hw on devices without vendor partition" am: e7f923f0 am: ed1813fa am: beac41dd am: 1476d0cf Change-Id: I7f0bbda231b8f760a12d56f637ccea386def5735