Merge "Disable -Wpragma-pack for this project." am: b35ac896c3
am: 41d208bed0

Change-Id: Ie7d0c8ffd111004c53336295210f76e39604a501