Merge changes Ife2dd406,I1ac481a2 into honeycomb

* changes:
  Assembly coded android_memset16 and android_memset32
  init: Fix parser line numbering