[automerger skipped] Merge "Move packages from *_product.mk to *_system_ext.mk" am: ae541174cc
am: 1d18ae8e7d
am: 3d97e10186
-s ours
am skip reason: Change-Id I0aba1343b0342887f4bc5bc1cff47f96d4803214 with SHA-1 82c0e3e268
is in history
Change-Id: Id8900ec227bc803a41607b919004df4f883a1487
This commit is contained in: