Merge "trusty/storage/* to Android.bp" am: 1dcd257a21 am: 1561e34bf4
am: 9b7632ef8a

Change-Id: I0cd118b47b1b983012666bd2f79fc78cc1b5128c