am ca940507: Merge into jb-mr1-dev
am ca940507: Merge into jb-mr1-dev

* commit 'ca94050705ff1886e622a09c2691a76e92c0f9d8':
  Allow multiple 'parcelable' declarations in aidl files

xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base