Merge "Add define needed by new vixl"
am: 621a27ed21

Change-Id: If7d59f6d9bc859b88e333b5316ffbd275bc2a49a