Merge changes I35c3ca3d,I5522ee84

* changes:
  AvrcpController null pointer exceptions.
  Update A2DP Sink Connect timeouts.