Merge "Give TARGET_OUT_HEADERS to vendor modules" am: c86c8502ac am: e51b222801
am: 8012c195f8

Change-Id: I30865a364c14438668d2ecd1bcbd68c735eeb24d