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

Change-Id: I3fc6e08e074ad0e0bbf767c32fea9719d098b7d5