Merge "[ndk] Fixed sample SanAngeles to properly pause/resume"