Merge "Add adbd_prop, system_adbd_prop property types." am: b8c108e15f

Change-Id: Ifa7434a88ab72902166587c892b9dc466573ffdc