Android S Beta 5
Merge "native handle - fix ubsan abort"