am c0272031: resolved conflicts for merge of a1867fb0 to mnc-dev-plus-aosp

* commit 'c02720316d348434ef2ba78030dd8484be0b35f7':
  [RenderScript] update the type of offsets for BLAS.BNNM