am dbd5ecad: resolved conflicts for merge of e5408907 to jb-dev-plus-aosp

* commit 'dbd5ecad26e39281bb83f97664bc32555c5c071a':
  [MIPS] Add support for MIPS syscalls