[automerger skipped] Merge "Remove projects being moved into from system/core...
[automerger skipped] Merge "Remove projects being moved into from system/core into system/memory" am: f7a6c458
am: d9d3cb4a -s ours
am skip reason: change_id I98793edd10954058448727635f101219f71d3ccf with SHA1 dc58e3b9 is in history
Change-Id: I7fb8e3b3a77a20f1c70667a7cdb98bc4815bfe57