Merge "Add OWNERS in build/make"
am: d79ce64555

Change-Id: Ic4bfd5c9d8756055faa6781772d93bca801e114d