Add mobile targets to module storage modules

Change-Id: I5b8cfe59229a71e70d9ddfe7991011b7472f5b9e
(cherry picked from commit 33d562320c2557e564d990a21dab235fc43ee6e5)