Android N Preview 5 (NPD90G)
Merge changes from topic 'rebase_r256229'

* changes:
  Fix up mclinker so that it builds/runs for LLVM rebase to r256229.
  Rebase mclinker for LLVM update to r256229.