Merge "Remove framework.aidl rules"
am: dcc27d0680

Change-Id: I58c3434d32a7c0ceb21eadca8e32b83b12e0c9e4