Merge "Remove remaining bionic support for TARGET_CPU_SMP being false."