Merge "Disable bitstring type check runtime hooks." am: 1efa7cb8c4
am: 72c18c972d

Change-Id: I05d9cac463f9a69181359df9731ccd730644b376