[automerger skipped] Merge "libbinder: stability check moved to trans time" am: 9f268673 -s ours
am: 7ee88d38 -s ours
am skip reason: change_id Iff026e81a130dbb8885ca82ec24e69a5768847eb with SHA1 6e5a7753 is in history
Change-Id: I9a3312915d1762d55504150ed7430309c7eaafcc