Merge "Move bionic contributions to runtime apex"