am b307dcd8: resolved conflicts for merge of 3f95c89d to lmp-mr1-dev-plus-aosp

* commit 'b307dcd8715ea4ffa456d819e8e8812719d5e760':
  Remove libsigchain from LD_PRELOADs