Merge changes I6826b287,Ia8e6db89 into main

* changes:
  Skip tests if vendor partition is on Android S
  libsnapshot: Address GRF config when updating from Android S config