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

Change-Id: If0487fd709a086c10833c470b234c449c4e95cdd