Merge "binderStabilityTest: rewrite pieces w/ no AIDL"