[automerger skipped] Merge "Don't re-export libbinder headers from libstagefright_foundation" am: 4c358801 am: f1d8291a am: ec6af171 -s ours
am skip reason: Change-Id Id16054593487f042fba6e46b114da52439e98e07 with SHA-1 a959536b is in history
Change-Id: I5bb953e080dc009518e1607807891c7c69cfb70c