Merge "storaged: move proto file to /data/misc_ce/0/storaged"