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

Change-Id: Ic6fcfbe9a1a2e048b3c673ddaf5110c17acf48ec