Merge "Re-unite sources with their headers" am: e43444a00b am: 946d11d216 am: b365b0db93
am: 68227128ac  -s ours

Change-Id: Iaf5274b7151a42617f7a19c4e98cbd8829e8b612