[automerger skipped] Merge "releasetools: Ignore nonexistent APEX overrides." am: d077c5b88e
am: 0f6c1d2b47 -s ours
am skip reason: change_id I2bad0f5c00753ed36ec5ae3431c7dc2ff1fc3e9c with SHA1 b369c7226a is in history

Change-Id: Ia348c8e8555e2ada9f54a4a03a3e5ee1b338d91d