Merge "libstagefright: add camera owners to Camera*.h"