Merge "Cleanup: remove VNDK APEX exception from binder" am: dc267c5b3d am: c4048a594d

Change-Id: I4cd8a178b8744d55e85c54dffde36b70a418aa30