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

Change-Id: I434554e710311bd6a43089f8191648d5adc8c17b