Merge "cpu-features: Add android_setCpu()"