Merge "Disable generating Binder#getTransactionName." am: 9119e2e49d
am: 6722abdede

Change-Id: Ie1016f24f6d3ff6a97b2e827215730d1dc6dec41