[automerger skipped] Make compiling an apex image explicit.
am: 73bdad5a84 -s ours
am skip reason: change_id Ie91c5b8d271783f04e4c1501f315a3ec59137475 with SHA1 c5e3a52473 is in history

Change-Id: I892fafb49679c6b341c67e8f04a7b999e22304a7