Merge "device.mk: enable emulated storage after the merge of R" am: d80b0bc663

Original change: https://android-review.googlesource.com/c/device/ti/beagle-x15/+/1465874

Change-Id: Id4fd3808d9db26eb39140f941dadd2fe2068682e