Was generating code that uses the wrong RpcData.
Was generating code that uses the wrong RpcData.

Change-Id: I7984ac8306d7e293c6e4ccb75c5f03c508e465af

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