Merge changes I7bb9d561,I2748d4a7 into rvc-dev

* changes:
  Freeze 'current' matrix as '5'.
  bpfmt compat matrix Android.bp