Compile core-apps according to their own "reason" for A/B
am: 9438528d99

Change-Id: Iba85d525810252b34bc862017b9ffe578f27fc93