Merge "Remove framework.aidl rules" am: dcc27d0680
am: a5ea645aff

Change-Id: Ica84434ffcfdb33c38a7571b344f47a354bf58b2