[automerger skipped] Merge "Mark some aidl_interface modules as unstable" am:...
[automerger skipped] Merge "Mark some aidl_interface modules as unstable" am: 77a58cde am: 1771ba5c -s ours am: 082f4466 -s ours
am skip reason: Change-Id I1257c66de6dd42b2d32d47ed74cb2878f79d14fb with SHA-1 db589dde is in history
Change-Id: I4baab374b7bd8c44757bdd254330c28760f27af2