Fix Pep8 1.4.6 warnings

Pep8 1.4.6 fixes some missed occassions of the indentation
checks.

Change-Id: Ie87005a9b204db70d4b22bc28425758b282b1eb0
Sync units module from olso

There are lots of numeric expressions across some projects, such as
1024*1024 , 1024**3, 1000, 1000000 etc. This patch adds binary and
decimal unit constants. Replacing nummeric experssions with these
constants makes code more readable.

Change-Id: I45fb5a10009f22b1eedb07b3e52f1ce40403b068
Merge "Fix Pep8 1.4.6 warnings"
Merge "Sync units module from olso"