Merge "Enable VNDK for aosp_x86 and aosp_x86_64" am: 966e080ade am: d3d7c2e180
am: 18c29a2ffb  -s ours

Change-Id: Ic0ed6bfc21baa44c10e176de0582c6368461d63a