am d66aa916: Merge changes Ife2dd406,I1ac481a2 into honeycomb

* commit 'd66aa9162324ba263049d983e104756629c7af21':
  Assembly coded android_memset16 and android_memset32
  init: Fix parser line numbering