Merge "Use framework_native_aidl for AIDL files in frameworks/native/aidl"
am: 46993bb4f5

Change-Id: Ib87a5f2563707ffbd2eb2420487f618ee9eb39c7