Merge "disable CFI on some stagefright_foundation internals" into rvc-dev