Merge "Refactor AImage/AImageReader"