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

Change-Id: I2f4ce6cdf6d40f4b31892bf40fed879b19726568