Merge "Add PhotoEditor in AOSP builds"