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

Change-Id: Ieb8b71718b4a1d23a718dd8b0259466c5de3ad99