Merge "Bionic: Support kryo385 CPU" am: aabebb2772
am: e570822055

Change-Id: I921d622b274fbfbc2c3070f09e939717e3c4b240