Change size_mb to capacity, remove constants in the independent_disk related code.

Change-Id: Icec2c504c64f95a367bb8a6368cfb51738471f16