Merge changes I3a51e45a,I73b21022,I6a3984f9 into ics-aah

* changes:
  Update aidl for new Broker API.
  aidl: All flattenable types now must also be parcelable.
  Update aidl to new APIs.