Merge "idegen: Add compatibility for custom out directory"
am: ba6d87d125

Change-Id: I3fd0674d6d71271c337af197a10b3e33dc1f417e