Revert "Camera: Update MemoryHeapIon"

need to wait for the upstream branches to merge the other commits

This reverts commit ee0d8bac79267ba7b3ea249431c19e61ef72aef3.

Change-Id: I9d38180f07e1804e4863bff79af83da5bee6c427