Merge "Move props out of exported3_system_prop"