Fix android_hardware_samsung branch update