Merge changes If163fe2a,Ib736cc16

* changes:
  Adding primitive types to binderRecordReplayTest
  Refactored binderRecordReplayTest