[automerger skipped] Merge "Use framework_native_aidl for AIDL files in frameworks/native/aidl" am: 46993bb4f5 am: f4b1cdfe5d am: 02ce7858e5 am: cb6b9f12c7
am: c7b53f7540 -s ours
am skip reason: change_id I8acb39522541f1e06d1a4b69b7a53b328c202eff with SHA1 82f94056ce is in history

Change-Id: I3e9127d987476b07430118e0277c849301ed6c7c