Merge "Add system_file_type"
am: d14b18d80e

Change-Id: Idfc4aeb0f26076c9d77cff80e4906b4cbe807705