Merge "Support a relative OUT_DIR"
am: c3f4df7f2d

Change-Id: I9f9d14b868c449af63076d1dc6e651fea814e2c4