Merge "Add OWNERS in external/dexmaker" am: 9e6367a939
am: 14d593e1c3

Change-Id: I3796b3ba07f0cc4e09172cb3fce6b07da23872b1