Merge "Include VNDK snapshot for 32 bit binder" am: e59bb32cb7
am: 5d8dd1656b

Change-Id: I2da89b3359c38612bde1cc8dd244b57f34f9f61b