Merge "Remove HOST_PREFER_32_BIT" am: 182ff5e2e7
am: a128976547

Change-Id: I752f079e3a3b68a28ed49bb577b233dd11c26d77