Use ro.slim.device

  * Drop ro.product.device due to its problematic with unified devices

Change-Id: I95615e2c0edc6edb34280dac5ffb57468aa56955
Signed-off-by: Josue Rivera <prbassplayer@gmail.com>
Merge remote-tracking branch 'upstream/kk4.4' into kk4.4