Android S Beta 3
Merge changes I63a8ceda,Ibc34b74a

* changes:
  hikey960: fstab.hikey960: Set metadata as first_stage_mount to resolve adb remount overlay persistence issues
  hikey960: fstab.hikey960: Drop f2fs userdata