Add aosp_cf_x86_phone_noapex am: 146cc4ce64
am: ce18c15605

Change-Id: Id31450a81e8602a5314b84e56a38703eb7074e64