am 23dacde4: [DO NOT MERGE] fix a bug where surfaceflinger and system_server could deadlock

* commit '23dacde4b624921df4f2c9646d20ca7acae357b6':
  [DO NOT MERGE] fix a bug where surfaceflinger and system_server could deadlock