Merge "Merge "disable CFI on some stagefright_foundation internals" into...
Merge "Merge "disable CFI on some stagefright_foundation internals" into rvc-dev am: 4aac5779 am: f972bfa7" into rvc-d1-dev-plus-aosp am: c1b0dc5e
Change-Id: Ia632153243bab4d431412d9499817177ee46c715