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

Change-Id: I040472e5550f144f2dd8b43238030e0fe4f15bdf