Move libstorage includes into frameworks/base/lib/storage am: e78f853e46
am: afef87b1ba

Change-Id: Iff9c41710528af37a788973ac4a1080024808c95