am 24dc9363: resolved conflicts for merge of 1bc98ccb to gingerbread-plus-aosp

* commit '24dc936346b4a31005ac28c4bd464320cca9320a':
  bionic: Add ARM optimized strcpy()