Merge "Link statically with libutils and libstagefright_foundation" into pi-dev