Port from l-preview branch to master

Change-Id: Ibbf283d2c924d732d289e42efc37cbfc952aea3a
Merge branch 'master' of github.com:anestisb/oatdump_plus