Merge "libbinder: don't export Static.h" am: b78f7c8eff
am: 588d5ed3a5

Change-Id: Iede4d804ff8385f87255d681e0e9820480e468de