Introduce Make variables for the various Runtime APEX names. am: f0b1de829b
am: ff9017670a

Change-Id: I9ebc9503df2cdc6bb94ef5511fa7a399fbc1201c