Compile core-apps according to their own "reason" for A/B am: 9438528d99 am: 54a3247073 am: 30d58efb59  -s ours
am: 88b02592f4

Change-Id: Iec1399bdafc659172d61c0dbe97b3a3dcd7ff7d4