Waffle images, API function block calls, Android updates

#732