Merge "Change MANAGE_EXTERNAL_STORAGE to signature|appop|preinstalled."