Merge "Fix include syntax on libcore/OWNERS file" am: 9e499222f1
am: 8b1c32fd37

Change-Id: I2b544908a6e78a8a1ed51767b0d9af2384374168